Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 22 Jul 2010 14:43:25 +0000 (14:43 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 22 Jul 2010 14:43:25 +0000 (14:43 +0000)

Trivial merge